Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,393 Commits 3 Branches 0 Tags
b6dba40c9e9926a86236ec9e121e34bf787ba473
Commit Graph

58798 Commits

Author SHA1 Message Date
Chris Thornton
b6dba40c9e Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 
am: 0f6a7abb83

* commit '0f6a7abb83687e8f800e7754cf585edca725d83e':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Id6e61a0ef2d51317a749526d132a6c9fb96899fa
 2016-05-06 18:10:23 +00:00
Chris Thornton
0f6a7abb83 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 2016-05-06 18:04:20 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692 
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
 2016-05-06 17:41:18 +00:00
Hans Boehm
cc9c83dbd4 Merge "Improve grammar in startService() documentation." 
am: e3a25ad692

* commit 'e3a25ad692cf88455222522542fe374a41024ccf':
  Improve grammar in startService() documentation.

Change-Id: Iaa95eb5d01d45b8352f1eeb0a7f1519b1958ddd4
 2016-05-06 17:36:11 +00:00
Ricky Wai
de1e4a1048 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I22bd5f8f3d71ae19a2fcac139531243f2546033e
 2016-05-06 12:19:00 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
Chris Thornton
d9729d1df8 Fix NPE in KeyphraseEnrollmentInfo.toString() 
If there are no enrollment applications on the system, but someone still
makes a KeyphraseEnrollmentInfo and tries to print it, it would generate
a NPE on a map object. Instead of setting the map to null when we don't
find any enrollment applications, we can just set it to an empty map.

Bug:28622866
Change-Id: I023e6fd90effd3143c19817a0d6637a013bebc31
 2016-05-05 17:20:44 -07:00
Adam Lesinski
3297250b9c Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1b411b89dae0aa623d796ab2ab7dabb52a6e28c0
 2016-05-05 23:35:31 +00:00
Adam Lesinski
c1ff12eccd Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 2016-05-05 23:23:43 +00:00
Vladislav Kaznacheev
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
 2016-05-05 23:16:04 +00:00
Adam Lesinski
8ce4e12c73 Fix issue where existing Activity Resources references would not update 
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.

However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.

This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.

Bug:27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
 2016-05-05 23:08:09 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Christopher Tate
f4f2ef5162 Correct docs about what is ignored in full-data backup 
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: Id1618de0e4027135a320cd133c244ba33d2960aa
 2016-05-05 22:31:53 +00:00
Joe Onorato
67af8a12ae Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I0bfd7f8967e828500fbae93673ec2bbf31d42b1c
 2016-05-05 22:22:02 +00:00
Christopher Tate
c5be8f8a4b Correct docs about what is ignored in full-data backup 
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.

Bug 28321431

Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
 2016-05-05 22:20:46 +00:00
Joe Onorato
47384f90b4 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 2016-05-05 22:11:57 +00:00
Yohei Yukawa
94c9aadc99 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
 2016-05-05 22:02:30 +00:00
Yohei Yukawa
9f76abc8ab Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 2016-05-05 21:55:50 +00:00
Joe Onorato
1476d32b87 Add the individual wakeup alarm counts to the batterystats checkin. 
Bug: 28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
 2016-05-05 14:53:25 -07:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation. 
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
 2016-05-05 13:09:28 -07:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
 2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Alan Viverette
ff71f781a3 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I292d86c36049afe621f559d01a12976c9f6068ca
 2016-05-05 18:54:34 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child" 
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
 2016-05-05 17:54:36 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
 2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Vladislav Kaznacheev
acf147e7e3 Add @TestApi to ActivityOptions.setLaunchStackId 
Bug: 28506739
Change-Id: I20fe4d080c125b38a84d9832a497340f805e82e7
 2016-05-05 09:32:27 -07:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev 
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
 2016-05-05 13:12:45 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag 
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
 2016-05-05 12:00:50 +01:00
Alan Viverette
1a1301286c Merge "Always assign leftover pixels to last weighted child" into nyc-dev 
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
 2016-05-05 02:30:18 +00:00
Alan Viverette
a11c21b412 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 2016-05-05 02:26:45 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
 2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
 2016-05-04 22:52:55 +00:00
Dianne Hackborn
5081e36897 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
 2016-05-04 22:52:52 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Dianne Hackborn
6eb119c7cb Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 2016-05-04 22:49:59 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
 2016-05-04 22:30:30 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging 
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
 2016-05-04 15:09:01 -07:00
Chet Haase
512c406be9 Merge "Force second measure pass when there is a configuration change" into nyc-dev 
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I2586fe3605461b2e6e4d9678afd6436078dab21c
 2016-05-04 21:51:38 +00:00
Chet Haase
c381c4e8e7 Merge "Force second measure pass when there is a configuration change" into nyc-dev 2016-05-04 21:49:11 +00:00
Yohei Yukawa
3af9c01322 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: I9b2f1e2ac8c595c3b19daab8b4ccb763ab700203
 2016-05-04 21:42:45 +00:00
Yohei Yukawa
68c1e1935d Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 2016-05-04 21:39:15 +00:00
Alan Viverette
cc26636f08 Always assign leftover pixels to last weighted child 
Bug: 27690033
Change-Id: Ibee51d49d3f7aa923750ce330df2e1aa2156f2bd
 2016-05-04 16:59:38 -04:00
Wale Ogunwale
506a604200 Merge "Make sure to pause activity before stopping" into nyc-dev 
am: 5f81a3f84c

* commit '5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
  Make sure to pause activity before stopping

Change-Id: I24e550abc72f78904d04d1c0bd2c3a004328555f
 2016-05-04 20:48:54 +00:00
Dianne Hackborn
d8e877d27d Maybe fix issue #28457907: Pebble app crash + reboot 
Fix this long-standing multi-threading issue in Bundle
when multiple threads are trying to read from a Bundle
and conflict to due unparceling.

There are two critical sections this protects: writing
the bundle in to a parcel (when it is doing this from
the bundle's already parcelled representation), and
unparcelling a bundle into its map of entries.

Change-Id: I5470002f090e63dd623a573da6c204d3b5b661f4
 2016-05-04 13:43:58 -07:00
Chris Craik
fc56377178 Fix View leakage from mPreSortedChildren 
bug:28553824

Change-Id: I62bfa3dcb121792dff7d00be1f4b018a99c96e1d
 2016-05-04 13:40:07 -07:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00