Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,579 Commits 3 Branches 0 Tags
94869bfae67b7bf9fa48115df6301d3f65e3e0ce
Commit Graph

60059 Commits

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

* commit '6f2bd8f0296a2ba075394847f5e62083a641cdef':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: If42bd0ca41d745136f986dcdd29560766a72af84
 2016-05-06 18:20:14 +00:00
Chris Thornton
6f2bd8f029 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 
am: 6e3449b33f

* commit '6e3449b33fd081a1e920c8e66797e280e78de66b':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Ic891770dba103e5e847441b346a4606341203992
 2016-05-06 18:15:35 +00:00
Chris Thornton
6e3449b33f Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 
am: 0f6a7abb83

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

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

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

Change-Id: Id179761ee138cecf7245788735dd3a3e063f9bc0
 2016-05-06 17:51:43 +00:00
Hans Boehm
3bc625a30a Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 
am: 1a72cf2e4f

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

Change-Id: Ifd50bd9f2b8c83e657bc6df419e70b30532649d0
 2016-05-06 17:47:23 +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
TreeHugger Robot
70c3000a31 Merge "Remove unused method from NetworkManagementService" 2016-05-06 15:57:52 +00:00
Ricky Wai
fefa033295 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e am: ecab71c9f7 
am: a31f37dc1c

* commit 'a31f37dc1ceec990e54ba839a876714a060148e2':
  Fix enterprise contacts APIs naming and docs

Change-Id: I5d8dd759805881c6134732be89f1105a727daed5
 2016-05-06 12:29:01 +00:00
Tony Mak
a31f37dc1c Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e 
am: ecab71c9f7

* commit 'ecab71c9f77cb0386a1be1c78e73bedf2524a536':
  Fix enterprise contacts APIs naming and docs

Change-Id: Idad8e3ee643ba955951a58185f4a8640579db206
 2016-05-06 12:23:58 +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
Ricky Wai
ecab71c9f7 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 
am: 13532bdd2e

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

Change-Id: I2305b72e0e3a1d5625d9016ffefed16fd7493c3e
 2016-05-06 12:18:58 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
TreeHugger Robot
a806c8e58c Merge "Indicate the NsdServiceInfo attributes are only filled in for a resolved service." 2016-05-06 01:34:51 +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
0061228b4b Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd am: 3297250b9c 
am: 77acaf86b3

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

Change-Id: I8e4b607b1ae5339ef727563d162045376dbb255b
 2016-05-05 23:44:57 +00:00
Christopher Wiley
2103e78e0c Remove unused method from NetworkManagementService 
Bug: 28598325
Test: Builds

Change-Id: I6a226b3410cda4e12a9225741ec81cd12b48892f
 2016-05-05 16:43:43 -07:00
Adam Lesinski
77acaf86b3 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd 
am: 3297250b9c

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

Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68
 2016-05-05 23:40:25 +00: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
001f8c57a8 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: I91cecfc1b5942d7e1c069e739be72a23472f6d47
 2016-05-05 23:35:28 +00:00
Vladislav Kaznacheev
70400ba52e Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 am: f1febf2700 
am: cae475563a

* commit 'cae475563aa1c5bd9aa38f3e8ef6f88a7b3ad00f':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I462fc13ea64f72cfbf620f473f8d55d9a532eb24
 2016-05-05 23:26:33 +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
cae475563a Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: f1febf2700

* commit 'f1febf27006a98adc5de584e7703338b85208ed3':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I13c413b1f0520262c271a397751a1a055e464655
 2016-05-05 23:21:04 +00:00
Vladislav Kaznacheev
f1febf2700 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

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

Change-Id: I7996b43fa80b5965feb69028be2526faa379a134
 2016-05-05 23:16:07 +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
c857689c75 Correct docs about what is ignored in full-data backup am: c5be8f8a4b am: 3f0db943c5 
am: fb74b50b19

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

Change-Id: I5ce7df7cf12f60948739525b36ef8047a669fd70
 2016-05-05 22:41:41 +00:00
Christopher Tate
fb74b50b19 Correct docs about what is ignored in full-data backup am: c5be8f8a4b 
am: 3f0db943c5

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

Change-Id: I00bb2ffdb52af988d9b7c231864b629fb2e27dbd
 2016-05-05 22:36:42 +00:00
Philip P. Moltmann
7d5da4b044 Indicate the NsdServiceInfo attributes are only filled in for a resolved service. 
Fixes: 28530428
Change-Id: Ic90bcf4eec10c7db0fd4a4acc8436dda6bab4ba8
 2016-05-05 22:34:00 +00:00
Joe Onorato
6add64cd59 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: 67af8a12ae 
am: 068061ff06

* commit '068061ff061a7f5ea6196fd5a3b428cbd4d40872':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I11555166cc09298c0d6d7fa131b57875ca024a65
 2016-05-05 22:32:10 +00:00
Christopher Tate
3f0db943c5 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: If70b6d247126758dcc82ec7780060ad99253a32d
 2016-05-05 22:31:54 +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
068061ff06 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 
am: 67af8a12ae

* commit '67af8a12ae20444f108f75c077b12821af52c909':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: Ia87d4db58bbdf4695b280edf6b6a79ad5425eea7
 2016-05-05 22:27:01 +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
Joe Onorato
cad814b9bf 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: I86640737d6f188b6b00901937d498ce1148ec10f
 2016-05-05 22:21:49 +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
Yohei Yukawa
7a7f7412cf Merge "Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab am: 94c9aadc99" into nyc-mr1-dev-plus-aosp 
am: 20fce5ed58

* commit '20fce5ed585ae0200927b50122366fd0196c565f':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I4f1a8071c8cb2c02cb6f8a6ef614363ae73682c3
 2016-05-05 22:12:30 +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
e16d2f8a29 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab 
am: 94c9aadc99

* commit '94c9aadc99655de225f0ee8f302aa36a1f59f043':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I86c0709e2cacce9275b886a523b37fef6b6b49ce
 2016-05-05 22:07:05 +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
117facb300 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 
am: 9f76abc8ab

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

Change-Id: I09eb284cb9a9b0dea96e3092a5f81ab894ee902b
 2016-05-05 22:02:22 +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
Android Build Merger (Role)
f07abaa6cb Merge "Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac am: 45c6eb2164" 2016-05-05 19:58:23 +00:00
Ian Rogers
26b522c6e3 Merge "Fix divergent equals and hashCode behavior." 2016-05-05 19:57:46 +00:00
Robert Carr
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac 
am: 45c6eb2164

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

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
 2016-05-05 19:57:27 +00:00
Robert Carr
45c6eb2164 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 
am: b9d2502eac

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

Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4
 2016-05-05 19:52:27 +00:00