Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,809 Commits 3 Branches 0 Tags
ec0a5e0bead4ae51b60a02fad3a9fcedbfb2f461
Commit Graph

63127 Commits

Author SHA1 Message Date
Makoto Onuki
ec0a5e0bea Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev 
am: ca94f29

* commit 'ca94f29366b9b6e3211351c2d098060114ef5fa8':
  Make FastXmlSerializer more suitable to persist arbitrary strings

Change-Id: Ib9a061aaad82054c0060cbc2b84118a71d1c098b
 2016-04-06 00:43:46 +00:00
Makoto Onuki
ca94f29366 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev 2016-04-06 00:36:52 +00:00
Joe Onorato
e9ca789f85 Merge "Add stack traces to logs about mismatched sequenece numbers in procstats." into nyc-dev 
am: 9b87cc2

* commit '9b87cc2b8b7a72249aeb1f12b4482ea7fad29cb5':
  Add stack traces to logs about mismatched sequenece numbers in procstats.

Change-Id: Ia932b31cc3d05c4224d933d85193ca6f62d0cc8b
 2016-04-06 00:30:36 +00:00
Joe Onorato
9b87cc2b8b Merge "Add stack traces to logs about mismatched sequenece numbers in procstats." into nyc-dev 2016-04-06 00:21:56 +00:00
Eino-Ville Talvala
42b53cc1fc Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev 
am: 2a6f476

* commit '2a6f4768366b78965326710410fe938644feb60d':
  Camera2: Unlink camera device death listener on disconnect

Change-Id: Iddfc98e8d4aa699f1411d609589d729e323fb994
 2016-04-05 23:25:27 +00:00
Jeremy Joslin
7acd105411 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 
am: b770ed1

* commit 'b770ed132813356c2b1548b0a98c1edb565c7340':
  Have the NetworkScoreService bind to the scorer.

Change-Id: I319344d3362068624b4f3bda7f1cf1d563507115
 2016-04-05 23:25:18 +00:00
Christopher Tate
1ecb55a2be Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 
am: 71f4e14

* commit '71f4e1440202e884f99c00a1012669a5b43c4078':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: I77d195725db157eb22c48f5c6b28dfe30dad2f2b
 2016-04-05 23:24:59 +00:00
Kirill Grouchnikov
a8dc3d426f Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev 
am: 12454dc

* commit '12454dcab13a0b570937381d11f1c69fdde2fdbf':
  Return correct unfocused month date color for pre-Material themes.

Change-Id: Ia26c44ef5ce30f52149a5781c363865a41dbe9e2
 2016-04-05 23:24:55 +00:00
Makoto Onuki
3ae3557ea3 Make FastXmlSerializer more suitable to persist arbitrary strings 
- Encode '\u000' - '\u001F', so KXmlParser can read them properly.
Otherwise KXmlParser will ignore CRs/LFs in attributes, and CRs
in text.

- Originally FastXmlSerializer would throw if a string contains
dangling surrogate pairs.  Now we REPLACE them with.

Bug 27792649

Change-Id: I10c547dad2475b68f60e9e8208d9a3eae8e20063
 2016-04-05 16:12:07 -07:00
Eino-Ville Talvala
2a6f476836 Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev 2016-04-05 23:07:43 +00:00
Jeremy Joslin
b770ed1328 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 2016-04-05 22:27:11 +00:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
Kirill Grouchnikov
12454dcab1 Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev 2016-04-05 21:48:32 +00:00
Kirill Grouchnikov
7cf1586ce4 Return correct unfocused month date color for pre-Material themes. 
Also deprecate setter / getter for showWeekNumber field.

Bug: 28022795
Change-Id: Ie0c33353f76c2a3d9666959a07f6809b7b85183f
 2016-04-05 17:42:34 -04:00
Yohei Yukawa
26c8cca109 Merge "Don\'t give IME focus to temporarily detached View." into nyc-dev 
am: 1bc62ce

* commit '1bc62ce8468f1e3a8ac41b6e759f145623879ba5':
  Don't give IME focus to temporarily detached View.

Change-Id: I76ec7c37ba58dfaa9398edee05ea0d8dbe174f06
 2016-04-05 21:26:47 +00:00
Yohei Yukawa
1bc62ce846 Merge "Don't give IME focus to temporarily detached View." into nyc-dev 2016-04-05 21:21:09 +00:00
Ajay Panicker
b6e1dafe78 Allow factory reset when bluetooth is off (1/2) 
Bug: 27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
 2016-04-05 20:23:21 +00:00
Sunny Goyal
5e59ea2115 Merge "Changing startListening to only fetch views which are bound" into nyc-dev 
am: 60c74e8

* commit '60c74e836fc40d65c8ac58c231956f57d26ec7eb':
  Changing startListening to only fetch views which are bound

Change-Id: I811c2cb1603bef597eb958ff7fbd44a93d7075b2
 2016-04-05 18:58:01 +00:00
Chris Craik
3844affcef Merge "Fix software layer alpha" into nyc-dev 
am: cd6ea77d

* commit 'cd6ea77d07204d2ff5e1a0264dc24db215de8614':
  Fix software layer alpha

Change-Id: Ic0e8d3d5fa9e290f036d8e4fc59ee460b03020c9
 2016-04-05 18:57:56 +00:00
Sunny Goyal
60c74e836f Merge "Changing startListening to only fetch views which are bound" into nyc-dev 2016-04-05 18:53:18 +00:00
Chris Craik
cd6ea77d07 Merge "Fix software layer alpha" into nyc-dev 2016-04-05 18:50:26 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev 
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
 2016-04-05 17:36:11 +00:00
Oleksiy Vyalov
4588a46850 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 
am: 81c9ea4

* commit '81c9ea4034186cd3ff2c387972389eb3397aba46':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I317d3ee0c8c397671c31b858e9c33bffbe53f7cf
 2016-04-05 17:36:09 +00:00
Yohei Yukawa
eadb88fe37 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 
am: e470fcf

* commit 'e470fcfeb001d52c4add58f8420709cb6db7e7c4':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I9f83e4de49c527d629091ffc6cf13297bdd6df3b
 2016-04-05 17:28:32 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Oleksiy Vyalov
81c9ea4034 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 2016-04-05 17:27:24 +00:00
Yohei Yukawa
e470fcfeb0 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 2016-04-05 17:22:47 +00:00
Chris Craik
cfa6dade73 Fix software layer alpha 
Fixes: 27429404

Software layers must combine layerpaint alpha, if present, with view
alpha.

Change-Id: If9c7dcb53ab8754b4e123cf9cc332a566fd792c4
 2016-04-05 10:15:11 -07:00
Dianne Hackborn
eaa18f954a Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 
am: 4345904

* commit '434590405071b462573273637899599332c34187':
  (Docs only) Make battery stats process state docs more clear.

Change-Id: I234a4e3532043fbe00e861bacf48c4240fc2a63b
 2016-04-05 17:01:20 +00:00
Dianne Hackborn
4345904050 Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 2016-04-05 16:54:55 +00:00
Dianne Hackborn
a0200e3702 (Docs only) Make battery stats process state docs more clear. 
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
 2016-04-05 09:54:02 -07:00
Alan Viverette
ec9af6f6b2 Merge "Rewrite popup window positioning algorithm" into nyc-dev 
am: 9d8ec0f

* commit '9d8ec0f12ee67129afb4020aa1d91599073cfeab':
  Rewrite popup window positioning algorithm

Change-Id: I8e23de773a1a22278c17e8fb72d4f7b6da1c4921
 2016-04-05 16:35:35 +00:00
Alan Viverette
9d8ec0f12e Merge "Rewrite popup window positioning algorithm" into nyc-dev 2016-04-05 16:29:08 +00:00
Glenn Kasten
c5e036a67e Merge "Fix typo" into nyc-dev 
am: 5cb05f8

* commit '5cb05f810b618112443271fdc8f1cf731593657e':
  Fix typo

Change-Id: I1bc1cd930d99e82d0b5563fd8b9b0ce33184ead0
 2016-04-05 15:08:27 +00:00
Kirill Grouchnikov
94ecef02b4 Merge "Add a hidden test-only API to get Toolbar\'s navigation view." into nyc-dev 
am: bbcf432

* commit 'bbcf4327d216ff9aa9dcce57c485736d21ffed12':
  Add a hidden test-only API to get Toolbar's navigation view.

Change-Id: Id24760bed597ad0b154e0ec1120d065a4627c7ea
 2016-04-05 15:02:43 +00:00
Glenn Kasten
5cb05f810b Merge "Fix typo" into nyc-dev 2016-04-05 15:00:22 +00:00
Rubin Xu
586da02e83 Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 
am: 63d1ee4

* commit '63d1ee45eee7e01bd098c7a9694daaea300c1133':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: Iab160ad25bafd8850ea75fa8575b12466bf9e16b
 2016-04-05 14:56:44 +00:00
Kirill Grouchnikov
bbcf4327d2 Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev 2016-04-05 14:54:48 +00:00
Rubin Xu
63d1ee45ee Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 2016-04-05 14:52:02 +00:00
Oleksiy Vyalov
b68bcbdfe7 Send nativeDebuggable byte value as part of HELLO response. 
Bug: 27942453

Change-Id: I4a222c88e104040b08e603e300e54a1ca2c038fe
 2016-04-05 07:25:18 -07:00
Alan Viverette
1323b45ff5 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 
am: 16aaa3e

* commit '16aaa3e5355a8a7213bb4cce8383108b9430e3e2':
  Fix bad workaround docs in Resources.getDrawable()

Change-Id: Id40f9e082b21be5d550661a39c0bf826b03159aa
 2016-04-05 14:20:10 +00:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Jason Monk
d2ebee5e73 Revert "Add Preference#onDetachedFromActivity" 
am: b65b710

* commit 'b65b7105cd5d20bf8a9f9c1b10afd6df968bc442':
  Revert "Add Preference#onDetachedFromActivity"

Change-Id: I78a6d99746507b6cde29f25bf161693c5ced4128
 2016-04-05 14:13:32 +00:00
Robin Lee
892af97b0b Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 
am: 691b1a6

* commit '691b1a6005ed373ad75361aa5a1bd120f138f15c':
  Switch to work challenge if MP calls resetPassword

Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
 2016-04-05 14:13:30 +00:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity" 
This reverts commit e18dc50c63.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480)
 2016-04-05 14:06:47 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Lorenzo Colitti
c346f72614 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev 
am: 19e84f7

* commit '19e84f7b750c97d5d7440af16c7ba18bf759e5dc':
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.

Change-Id: I3e6593324fa955ab3c0e590655d0632347f83ec8
 2016-04-05 13:39:10 +00:00
Lorenzo Colitti
19e84f7b75 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev 
* changes:
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.
 2016-04-05 13:35:09 +00:00
Lorenzo Colitti
a3d5948c37 Clear LinkProperties on interface removed. 
When an interface is removed, all netlink events for that
interface are lost, because netd will no longer be able to
resolve the ifindex in the netlink event to an interface name,
and it only communicates to the framework events that include an
interface name.

This can cause us to end up with stale IP addresses if, for
example, wlan0 is removed because we switch wifi back from AP
mode to STA mode when exiting tethering. The presence of stale
IPv4 addresses can in turn lead us to miss a provisioning
notification because we already think we have an IPv4 address.

Change-Id: Ib64559a5a4fa261f483760b69fa7996314e7cc17
 2016-04-05 20:28:57 +09:00
Keisuke Kuroyanagi
ca3fdc2bdc Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 
am: a46be16

* commit 'a46be16612573ce083404e8731a96ec30eba3c48':
  Fix: Selection handle behavior in scrolled TextView.

Change-Id: I36d2bb4d219242c9fe6cc159a0cd3f55489687dd
 2016-04-05 09:30:51 +00:00